acommdate change for new logic flow