Issue #20 part 2,3