draft changes with Mandeep