modify for new scheme