address performance problem by ~95%