More modifications to the structure