Back to almost working status