Switched to new value module