before merge with ou design