Fixed optimization issue
Done near and within 30 minutes