updated draw methods