Working with Tony to get fixes in place