Fix tags; should be array
New design