Is it worth moving this to a shared step?