added simulator and data