Elaborated solution + added codices