Jasmine's edit