P4 & P5 major fixes