Implemented changes