Some small changes to merge our files
Some Changes