moved stefan to core