more changes for setting up