r57: Updates for Source