controller clean up, at least 20% faster and more efficient  (yes Darko 20% )