Drawing class updated