Very important changes for stat viewer