Made a few changes and added a class