Small changes during class