a few changes... wheeee