Separating the last step into two