improved performance

improved performance