removing temp, minor changes