Updated for ProMotion 2.0