made adjustments for devise