start fixing P1 references