Partially debugged update
Unpack tuples to lists