small adjustments to make tunisian work for now.