adding reporting and other features