-Part 1 of fixing capitalization issue