Simplify-sorry for much more commits, web editing