Adjusted to new lltool