add report-only functionality
sandbox support
remove some redundancy