class time
some final changes