thunder 2nd pass
few changes