Changed variable references to remain consistent