Manually merged some files. #2