7/23/14 - major changes