added some more general setup