pop/adjust overhaul