more updates - removed form b/c running over time