Summer update and cleanup step 1