optimized performance
more preformance improvements