Slowly fixing things…