Switched to a more sane approach for value management