Final Update for 6-12