First commit of my modifications