Merged into 1 file and added history