update to v2.6+ syntax