Just some changes2