Looked at this, but seems to work better as it is because there a fair amount going on in that if statement.