Made universal (not just IPB.)