Updated to latest - includes changes agreed w/ client