Move some logic to pew stage