Agree, that would be a much better solution.