Made some changes after testing.