added monitoring and enhancement