Changed to new INPUT/OUTPUT-model