First commit - Minor changes 2