intergrating changes from earlier