German changes, thanks to Sebastian Michel