merged a few steps together