added device controls back in