framework update for new implementation