Call refactoring & ratio fix