Your version sounds better that what I recall about the original, though if given the choice I'd still have you fix the Star Wars prequels first.