Incorporating Joachims suggestions