Optimized code
merge fix