Latest changes_21_Nov