added aaron's display changes to this project