Made some changes

another commit