Betterized the file
merged your stuff