Working well again, about to improve