moved monitoring into base