simplified make step and added missing possible steps