Moved the location of the first and second token parsing to improve speed