working on issue # 17