Removed iOUTPUT, further corrections