Restructured second pass slightly