Updated to include Mobile devices