Conform this user story #46 with Marcels wishes - sadly a little slow :/