Elaborate complete monitoring a little better