A few more updates made in class