Updated to be in line with recent Philip changes