updated to use local framework