before branching
implemented searching by name