Added raptor2 patch by Ray