draw methods rewritten (again)