updated monitoring class