Made a couple more changes