Noted a step to maybe be removed