modify for 620