laptop update
rebased