rework of framework