Updated to match recent changes to Philip