#946 Added comments