Changes per comments. Name change and function ordering