Merged with Griffin's version- may cause fast-forward problems