Raptor: change after review