Added rework remarks