improved foreman support