Updated searche function. Added list function.