UDP done, better data packet handling