Added initial special case handler