removed temps AGAIN