Consolidated input from o94