Changed more printing code