Added simulator mode