Added P31 and P31.5 :zap: