Move keep workign logic