Added termination back in