Changes as per hound and Nate comments