fixed token
added toggle