Matthew - final steps before finish