Changes from issues 1 & 2.