some mojor imrovements in performance