added let & unit support