I edited it to include both cases just after you responded.

-'rilla