Added modifications from Wednesday's software meeting