re-do first post with poole
resolve conflicts poole