raw metrics now appear to be working