Oops. Forgot to declare some vars, breaking speedcd merge