Mason Simulator -- refactorization.