Added partial matching and list reset