Changed to 1.0 with fa modifications