Finished implementation of WP2