Made a few changes to methods