refatoring monitors
fixing merge issue