simplified, only return mean/std data in both cases. Fixed column names.