added closure and yui support back