improved p12
further improved p12