added shallot support