Added FC functions
Some reshuffling