refined a few things