New data stuff added
Load data fixes