Marked with a CR and #18