updated from progress branch