Change to use better data