updated files after Mandeep meeting