commit with Cory's Saturday changes