Moving all to tokens
Added final logging for failing message