Merge "Simulator new (basic) version)"