First mods for new GFC owners

Then there was this