Modified a few thing on the setup