Revert "Revert "dużo zmian""

This reverts commit d6da91761e089332fa6f83eed8d9e709deb375c4.