don't have uniform arrays anymore
function names, removed old code