Updating Monitoring 
closes #11