June 11, 2014 - includes insertion of many "if" statements