final commit on 07-09