final changes, a sorry state of affairs.... :(