How to make OST pond-aware