Maybe make a new middleware step for this?