Updated to the new Drawing System