more working on opensource-friendliness