WTIOS simplification