wip smoother user experience