added match and remove method