Modified status culculating
Merge branch 'ModifyCulculating'