made some changes but still doesn't work properly