Reduced cpu usage of dashboard substantially and off-by-one error