revert to 4.7 for now, add full butter later