still fixing setup tasks