changed for simulation fixes