Hopefully working now, improved reporting