Changes to work wite foreman