unnecessary closure
todo updated
rewrited with wrappers
using util.isDef now