Reorganize so steps can be shared