SExchange updated 2 issues needs to be reviewed