good God this is painful
more changes