Add new file and minor changes