Alternate way of handling end of WC...