some changes but still not work