Iteration on comments from Lopaka.