Some corrections +loop included