a few changes to clean up fxn