[Refactoring] modified computing