OneShot: some chainges