lastest changes
merge laptop