Waw added and work
Fix changes made in Poland