Progress on simulator