version1.6,update two calculate method