updated to new framework base (experimental)