Changed draw logic