P34 compatablity

master had moved on.