Changed to class-setup