Added simulator part