'solved' some performance issues