added closure tools. not integrated to build pass