Commit 7 -Major Changes 2