Uncommented code, which works with current weaving; all tests passed