changes to draw devices2