update shell
in middle of adding remove
add validation for fetched token