centainty change and code refactoring