Pla 1579

please don't merge it yet!