Updated sources and separator