Commit 2 (some changes)