p03 and p05 improvements