more changes for uniformity throughout