Just a quick word of advice: in the ABC cut, after Harry and Ron (as Crabbe and Goyle) begin turning into themselves, there is a short scene of them running away from the common room--except the CGI for their hair wasn't there! Unless you can redo CGI, I'd leave it out.