Sounds good- I can see how that might be pretty error-prone.