Commiting just before rewritting the 2d section in more simple forms