Took out logic to defer drawing