Tidied P26 slightly