Add some sections
Improve where