MODIFY: case insensitive search
MODIFY: implement search method