merging with laptop versions