MISC. Update for laptop branch