Added device tag #'s etc