update for new closure syntax