Altered variable names as per #127