update with local changes Aug 19