7/15/14 - major code changes