some changes not working still