some changes i did