Further datahandling work