Condensing, added draw code