added additional caddy corner logic