Here are the files. Merge this with yours