reformats and introduces PsychicAdvisor
small renames