added search / update capabilities