removed the old closure object; updated everything accordingly