Mark Johnson: Custom modifications

Complete and Continue