7/31/14 - major changes and new additions