added more monitoring for endor