port in latest poole changes