Huge Changes dealing with name