Change to using two steps, see readme updates