Few changes but still not working