8/6/14 - major code changes