incorporate Markus goot points