more in class stuff updated