Merged from laptop