comit b4 working on lappy