Reverted back to simulator