Update to include setup