Some lithe changes