eliminated delay when switching devices