changes + test plan