Comments added, to be checked by JE