some optimization and removed unlimited dimensions of everything except results (performance issues)