WIP: Updated device