Second attempt

fix mistakes