Refactored calls.