All step 1 classes updated for graphics