change to use zip for reorganize data from database