restored commit 3