commit 1 & 3