change but still has bug