Updated from 10 April mtg