Add modified setup from Karl Broman