slight minimal changes during class