Updates to working
Merge with master