update for new closure handling possibly