Feldman's stdio changes