Updated drawing system