close #28 and #29 near to be done