added some more setup code