Add work for Class 4 and 5