Added more to secondPass