Updated Emma Simulator