Slight change in conventions used