added some changes from laptop