RW-80 #comment Adjusting admin configuration
RW-80 #comment Adding code review comments in-line