a few changes..