rollback second pool, little parser change