Refactored callbacks to use the consistent name: next