modify for analyzer