Modified setup a bit