Simplified and more efficient