UPDATED

some changes