merged from clowwindy