Some updates and also adding in class 4