Analyzed By change, OCU Box fix