More progress on p6 final