added handling on monitoring