almost all fixed for adding section