Changed concat_files and magic_string solutions