This is Andreas's Option 2