Average P-Wave adapted to new P-Wave definition