* Improve granularity a bit more