move token checks to manager