Made a few alterations