Working
Fixed firstPass