christoph: test + 2011 + switch