Improvement Stage one in Simulator