Improvements for poland