switched back to v3.6