first commit 3 hw fix