Updated calls logic.