Made changes for future uses.