Modify to run when not connected