Added some more "AF" changes...