Updated & Optimized