Moved to input/output files only