moved to elif
generic update