Modified setup to work better