core system flow updated