Made more modifications in preparation for future changes.