end of P04, some improvements left