some edits for closures