final commit on 6/24