Good call, I'll take that logic from the v6 tag. Already fixed the parseInt stuff :). And yeah, I can chop those two conditionals into one.