shortened the class a little bit