Pla 1058

!! DON'T MERGE JUST CODE REVIEW !!