Add Poole design and clean up