Restored parts of commenting