server work to be merge with laptop
merge with laptop code