Device Chart logic changed.2