refined a bit more