Updated to the new drawing system