implemented 7/30 issues 2 & 3