Updated from my laptop