Update for pouch 2.0

Hi,

Sorry about the whitespace.

All tests are passing, so should be good to go.

Thanks