I also think that some of the calls from FF11 should be added