commit 1
putting all commits together