Incorporated O's suggestions