More modifications to closure section