Now more or less working