Rewrote dataparser