some improvements and performannce test