add better monitoring