Optimized some versions