change device arg as optional
v1.5-2