Separate the next step actions more clearer