Simplified change to use existing code