Better Undertaker generation