Reworked sections
merged