some more changes to work with the new framework