Made some more changes