rework according to new framework