Changes Commit to solve Issue 1