AAE 642 PS 3 last commit before code cleanup for submission