Added non simulate option