Modifications to Display Code