Add probs 6 & 7. Enhance probs 1-5