added better monitoring