add setupDone checking