More WIP restricting P1 fields