Updated with comments
Updated with comments
Merge and comment updates
Merge and comment updates