updated the class a bit