closed issues 1 & 2