some constant changes, todo
todo, conflict resolved