hiran commit 3 and 4
hiran commit 4
resolve commits