Peter's commit to the yahoo3 project