Update stuff for @piotrplaneta