2jet stuff
merged with thomas