report and GUI and Client
merge conflicts resolved