Refactored how we draw