Small modifications following team's comments