changes to support fier migration

- still not correct