swift r2380 should put a tidier version of this into the codebase. I'm fairly confident about it but I can't test against red.unl.edu at the moment as it isn't taking my jobs today. --