[^] some changes from laptop