Updated with the new LeanTomato