- destination handling improved