Some modifications to setup