Added remap in FPMap