added a few more named arguments to setup function, not completed yet