Major update from Coral sample.