GP and EI are working correctly now