Rework rate check/display functions