New class and minor update