A lot more work done on these sections