removed butler and bbq, updated to 3.5.1