Performance...

Updates to jb