update to v2.640