working v2 after dev edits