More modifications implemented.