Device / Demo Code Update