Be even more optimized