improve performance and new incons