updated to 7/16 updates with Jenn