Converted to src only. Snapshot version