Adjusted according to latest comments from Thomas