done some todoses bounded with renaming