Some linebreaks deleted to simplify diff