Token checking added
COmmit after merge