clean up the calling of options a bit. make it optional