Putting back things I shouldn't have deleted.