Implemented adjusted changes