all draw methods updated