Merge install step two to one