Implemented Elena's changes