Cleaned up, slightly faster heart rate