Optimized another snippit