Changes for Class stuff