Advisor Guide + changes