Preliminary changes. Second Commit