Not just problem 106 any more
Manual merge of working branch