ticket:2 changed after review