a few changes I seem to have made...