Condensed two files into one