Updated with more work changes.