Sure. I was trying to minimize the changes in the base code, but may as well.