Instructor side improved