add package polling and change function removeMatt