Changed variable names so more apt