adding a bunch of stuff from fisa