Handles sections and regular tokens bettert