pr - client side + server side changes and notes - proberem po skypu zitra