modification to the setup