Updated from scratch work at work