GenerateSmatrices now works better for recruit version