phil
merged and authenticated