changes done some initial exception