Made some changes to this