improve duo support