Revised Factor Model Monte Carlo