Search commit 4
Some Fixes