Made some changes as usual