Updating to latest from FooPlugins