added/deleted various from laptop verisons