more rework
repair code after rework