Follow Florian's suggestions