Comments and little speed up