Added Return Device functionality