Slight modifications to Foo code