WP5 – Surface mapping