fixed Sg2 bug !
Merge branch 'organize_data'