more changes to setup