optimize the bypass mode