Final checkin for 8/24