sync with latest narcissus