Implemented preliminary changes