Saved a bit of memory by not storing r_sites