Improve monitor