new changes - mostly from guru daven