Pool improvements ! #Fresh