Add some comments on decisions made