review and fix v2