close todo 27 and 30