UPdated project from laptop