incorporate changes dicussed today