Modified for all devices