Add more closure steps