Updated to most recent setup