Updated version from laptop