CLIENT refactoring and calc time