Some mods to early version of framework