Addressing Issue tickets 71 - 74.