more or less working now