refactored draw?, passes tests