Edit fully working (back to one-to-many)