merge from netbook