Merged few more files together