wip: fixin data