Modified final version of input files and other changes