Added enhanced advisor, moved particle setup.