Made a few changes Check pleaz