Replaced server with middleware where it makes sense
Updated report