fix-efficiency not functioning
fix wrong data saved
Merge branch 'dev_mirror' into dev