Added comments for custom changes