Good suggestion. Didn't notice the code dup...