initial mapping needed
better new data handling