updated for v3.5