[UPDATE] integrated pooling, minor changes