Improvemnet/doing the comment