Comeback episode now with seamless editing