re #9608 4 and 5 done, next is the MD ones