updated for florian.urban version: 1.0