Works on Washington deployment
Cleanup
Simplify