Import from raptor
Import from raptor