fixing the setup