Removed comments
Changed makeDisplay calls to reflect new arguments