added thyme specific stuff