Michael's fixes added