re-fixed comments