Improved X Drawing :shipit: