Some changes need to be reviewed