Planification of solution part 2

The same with some coments on panchitoJoh