some old unfinished changes