not working but made some changes