Core system flow updated