Refined a little bit more