started adding support for p03 and p05