AlanAMay commit

This is the correct one, had trouble pushing the correct branch.