Replaced use of analysis monitor