Add slightly optimized version