Add stuff for p6