actually, I guess this wouldn't be necessary if you removed the code duplication from above...