framework update and code organization