Moved token-checking into Task function