First edit by thilo. More work to do.