A bit of reshuffle and comments