Made changes for d-type maintenance