final commit before submission, ie 7-10 compatible