Update to new Raptor