Composing in latest cornerstone