Modified to match closer to foobooks example