Added Monitoring and safety