improved performance

improved performance and visual