comments fixed in a way :/