done + fixed bug on SPM data.