addded searching feature and other stuff
merged