Performance improve 100% maybe