adding the evat index and few bug fixes in the remove