WP1: Better diagnostics