Updated as feedback from Yuke