Part z+2
FIXES