redone first commit 2