Device Chart logic changed.3