updated for florian.todo version: 1.0