My additions and device specific changes