Maybe making it redundant enough to cover both sets of circumstances would be a good idea grin